From 9894b89bd97271e6f6c60214587ca45686ac5223 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 23 Oct 2001 17:45:33 +0000 Subject: [PATCH] Apply fix from Dov Grobgeld, #61858 2001-10-23 Havoc Pennington * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply fix from Dov Grobgeld, #61858 --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktextlayout.c | 26 ++++++++++++-------------- 8 files changed, 47 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ef6451c0b7..1f4b156809 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-10-23 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_pixel): Apply + fix from Dov Grobgeld, #61858 + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_im_spot_location): diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 599c82f302..018a33aea8 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2117,14 +2117,6 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout, g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout)); g_return_if_fail (target_iter != NULL); - /* Adjust pixels to be on-screen. This gives nice - behavior if the user is dragging with a pointer grab. - */ - if (x < 0) - x = 0; - if (x > layout->width) - x = layout->width; - get_line_at_y (layout, y, &line, &line_top); display = gtk_text_layout_get_line_display (layout, line, FALSE); @@ -2132,17 +2124,23 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout, x -= display->x_offset; y -= line_top + display->top_margin; - /* We clamp y to the area of the actual layout so that the layouts - * hit testing works OK on the space above and below the layout + /* If we are below the layout, position the cursor at the last character + * of the line. */ - y = CLAMP (y, 0, display->height - display->top_margin - display->bottom_margin - 1); - - if (!pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE, - &byte_index, &trailing)) + if (y > display->height - display->top_margin - display->bottom_margin) { byte_index = _gtk_text_line_byte_count (line); trailing = 0; } + else + { + /* Ignore the "outside" return value from pango. Pango is doing + * the right thing even if we are outside the layout in the + * x-direction. + */ + pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE, + &byte_index, &trailing); + } line_display_index_to_iter (layout, display, target_iter, byte_index, trailing); -- 2.30.2